From 01de2b2dca3179698dffc391c0289f3c0dc839a2 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Tue, 25 Jul 2017 21:30:57 +0100 Subject: [PATCH] mention-java-common-package Gbp-Pq: Name mention-java-common-package.diff --- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 3 +++ svtools/source/java/javaerror.src | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 8649bd121b8..c9757d527ed 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -144,6 +144,9 @@ static bool findAndSelect(std::unique_ptr * ppInfo) if (errcode == JFW_E_NO_JAVA_FOUND) { fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!\n"); + fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n"); + fprintf(stderr,"is installed.\n"); + fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n"); return false; } else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE) diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index 60d7c720ebe..588f034f1f7 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -21,7 +21,7 @@ String STR_WARNING_JAVANOTFOUND { - Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; + Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE (and libreoffice-java-common) and restart %PRODUCTNAME."; }; String STR_WARNING_JAVANOTFOUND_MAC @@ -36,7 +36,7 @@ String STR_WARNING_INVALIDJAVASETTINGS_MAC String STR_WARNING_INVALIDJAVASETTINGS { - Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."; + Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME. Maybe you also need to install libreoffice-java-common"; }; String STR_ERROR_JVMCREATIONFAILED_MAC @@ -46,7 +46,7 @@ String STR_ERROR_JVMCREATIONFAILED_MAC String STR_ERROR_JVMCREATIONFAILED { - Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced."; + Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced or install libreoffice-java-common if not already installed."; }; String STR_WARNING_JAVANOTFOUND_TITLE -- 2.30.2